missing #include <ctype.h>.

2007-05-23  Yevgen Muntyan  <muntyan@tamu.edu>

	* gtk/gtkprintunixdialog.c: missing #include <ctype.h>.

	* gtk/gtkhandlebox.c (gtk_handle_box_paint):
	* gtk/gtkpagesetupunixdialog.c (_gtk_load_custom_papers):
	* gtk/gtkstatusbar.c (gtk_statusbar_get_context_id):
	* gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path):
	* gtk/gtktrayicon-x11.c (gtk_tray_icon_send_dock_request):
	* gtk/gtkpreview.c (gtk_preview_finalize):
	* gtk/gtknotebook.c (gtk_notebook_set_group_id):
	* tests/testnotebookdnd.c (window_creation_function):
	* tests/testiconview.c (do_popup_menu):
	Fixed some compiler warnings (#440689).

svn path=/trunk/; revision=17898

diff --git a/ChangeLog b/ChangeLog
index 8f608198d7b1e5d098e0bf9062142145c81d244a..1950572e7b6bcd4de25e48b16d861c00caf515d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-05-23  Yevgen Muntyan  <muntyan@tamu.edu>
+
+       * gtk/gtkprintunixdialog.c: missing #include <ctype.h>.
+
+       * gtk/gtkhandlebox.c (gtk_handle_box_paint):
+       * gtk/gtkpagesetupunixdialog.c (_gtk_load_custom_papers):
+       * gtk/gtkstatusbar.c (gtk_statusbar_get_context_id):
+       * gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path):
+       * gtk/gtktrayicon-x11.c (gtk_tray_icon_send_dock_request):
+       * gtk/gtkpreview.c (gtk_preview_finalize):
+       * gtk/gtknotebook.c (gtk_notebook_set_group_id):
+       * tests/testnotebookdnd.c (window_creation_function):
+       * tests/testiconview.c (do_popup_menu):
+       Fixed some compiler warnings (#440689).
+
 2007-05-23  Kristian Rietveld  <kris@imendio.com>
 
        * gtk/gtktooltip.c (find_widget_under_pointer): translate coordinates

diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 064f3354eeff8a0fd47955eaf17bc518783f854b..ed78a6ff08d2d2815fcd391c633a51ac691ce419 100644 (file)
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -858,7 +858,7 @@ gtk_handle_box_paint (GtkWidget      *widget,
 {
   GtkBin *bin;
   GtkHandleBox *hb;
-  guint width, height;
+  gint width, height;
   GdkRectangle rect;
   GdkRectangle dest;
   gint handle_position;

diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index b056c5fb622559fdb808ea654a0a41a326586f81..7cce5083ae528b65c5f74f5150b2aeb7023d417a 100644 (file)
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -89,7 +89,6 @@ _gtk_icon_cache_new_for_path (const gchar *path)
   gint fd = -1;
   struct stat st;
   struct stat path_st;
-  gchar *buffer = NULL;
   CacheInfo info;
 
    /* Check if we have a cache file */

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index c79633cdabdb5c19435e25e021067923bc7a6c95..0e7fd29054cf6a75e5b3b0874e35f4d1d66575b2 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -7275,7 +7275,6 @@ void
 gtk_notebook_set_group_id (GtkNotebook *notebook,
                           gint         group_id)
 {
-  GtkNotebookPrivate *priv;
   gpointer group;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));

diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 2bd76c154ed18bcb842a7a4b85d93c6dd5714b91..f0d9445df6c39a7eed5e8dd837a3ff232c7804e7 100644 (file)
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -206,7 +206,6 @@ _gtk_load_custom_papers (void)
   for (i = 0; i < n_groups; ++i)
     {
       GtkPageSetup *page_setup;
-      GtkTreeIter iter;
 
       page_setup = gtk_page_setup_new_from_key_file (keyfile, groups[i], NULL);
       if (!page_setup)

diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c
index b240391e19a44f3488c45f21aee1847aa6eb5ce7..92fc4733279faaaccdc24261f424b8770ab28666 100644 (file)
--- a/gtk/gtkpreview.c
+++ b/gtk/gtkpreview.c
@@ -416,7 +416,6 @@ gtk_preview_finalize (GObject *object)
 
   preview = GTK_PREVIEW (object);
   g_free (preview->buffer);
-  preview->type = (GtkPreviewType) -1;
 
   G_OBJECT_CLASS (gtk_preview_parent_class)->finalize (object);
 }

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index b18af88a1c910f83a08b89608f486f92395331a2..8606d8a8dde69703d88af2c018837a5f8b407bae 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -21,6 +21,7 @@
 #include "config.h"
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <math.h>
 

diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 69c6787a5645ff8a50485b0a4756e5b0f5f83cae..9a035eded04150646efcd0a0d52a4168a3ea8e0b 100644 (file)
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -268,7 +268,7 @@ gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
                              const gchar  *context_description)
 {
   gchar *string;
-  guint *id;
+  guint id;
   
   g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
   g_return_val_if_fail (context_description != NULL, 0);

diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index baf41235f98afe007c5de5143cf919f4137c5d21..e53edde202df4ca4ba8efa5679edab94cc49d0ab 100755 (executable)
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -305,8 +305,8 @@ static void
 gtk_tray_icon_send_dock_request (GtkTrayIcon *icon)
 {
   GTK_NOTE (PLUGSOCKET,
-           g_print ("GtkStatusIcon %p: sending dock request to manager window %x\n",
-                    icon, icon->priv->manager_window));
+           g_print ("GtkStatusIcon %p: sending dock request to manager window %lx\n",
+                    icon, (gulong) icon->priv->manager_window));
 
   gtk_tray_icon_send_manager_message (icon,
                                      SYSTEM_TRAY_REQUEST_DOCK,
@@ -323,8 +323,8 @@ gtk_tray_icon_update_manager_window (GtkTrayIcon *icon)
   g_return_if_fail (GTK_WIDGET_REALIZED (icon));
 
   GTK_NOTE (PLUGSOCKET,
-           g_print ("GtkStatusIcon %p: updating tray icon manager window, current manager window: %x\n",
-                    icon, icon->priv->manager_window));
+           g_print ("GtkStatusIcon %p: updating tray icon manager window, current manager window: %lx\n",
+                    icon, (gulong) icon->priv->manager_window));
 
   if (icon->priv->manager_window != None)
     return;
@@ -351,8 +351,8 @@ gtk_tray_icon_update_manager_window (GtkTrayIcon *icon)
       GdkWindow *gdkwin;
 
       GTK_NOTE (PLUGSOCKET,
-               g_print ("GtkStatusIcon %p: is being managed by window %x\n",
-                               icon, icon->priv->manager_window));
+               g_print ("GtkStatusIcon %p: is being managed by window %lx\n",
+                               icon, (gulong) icon->priv->manager_window));
 
       gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
                                              icon->priv->manager_window);
@@ -392,8 +392,8 @@ gtk_tray_icon_delete (GtkWidget   *widget,
   GtkTrayIcon *icon = GTK_TRAY_ICON (widget);
 
   GTK_NOTE (PLUGSOCKET,
-           g_print ("GtkStatusIcon %p: delete notify, tray manager window %x\n",
-                    icon, icon->priv->manager_window));
+           g_print ("GtkStatusIcon %p: delete notify, tray manager window %lx\n",
+                    icon, (gulong) icon->priv->manager_window));
 
   gtk_widget_hide (widget);
   gtk_widget_unrealize (widget);
@@ -416,11 +416,11 @@ gtk_tray_icon_realize (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->realize (widget);
 
   GTK_NOTE (PLUGSOCKET,
-           g_print ("GtkStatusIcon %p: realized, window: %x, socket window: %x\n",
+           g_print ("GtkStatusIcon %p: realized, window: %lx, socket window: %lx\n",
                     widget,
-                    GDK_WINDOW_XWINDOW (widget->window),
+                    (gulong) GDK_WINDOW_XWINDOW (widget->window),
                     GTK_PLUG (icon)->socket_window ?
-                            GDK_WINDOW_XWINDOW (GTK_PLUG (icon)->socket_window) : 0));
+                            (gulong) GDK_WINDOW_XWINDOW (GTK_PLUG (icon)->socket_window) : 0UL));
 
   screen = gtk_widget_get_screen (widget);
   display = gdk_screen_get_display (screen);

diff --git a/tests/testiconview.c b/tests/testiconview.c
index 42d49a8fa47367b69046607cae17c89d67484d3b..76b54981c7d72a6287068f62afe6c1afef0861da 100644 (file)
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -346,7 +346,7 @@ do_popup_menu (GtkWidget      *icon_list,
       if (list)
         {
           path = (GtkTreePath*)list->data;
-          g_list_foreach (list->next, gtk_tree_path_free, NULL);
+          g_list_foreach (list->next, (GFunc) gtk_tree_path_free, NULL);
           g_list_free (list);
         }
     }

diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c
index d8364455dff9db43d9cb4fb398a3b169cf6fd26b..869439469ddfa027b67b572cc0822ce4f6938680 100644 (file)
--- a/tests/testnotebookdnd.c
+++ b/tests/testnotebookdnd.c
@@ -79,8 +79,8 @@ window_creation_function (GtkNotebook *source_notebook,
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   notebook = gtk_notebook_new ();
 
-  gtk_notebook_set_group_id (GTK_NOTEBOOK (notebook),
-                            gtk_notebook_get_group_id (source_notebook));
+  gtk_notebook_set_group (GTK_NOTEBOOK (notebook),
+                         gtk_notebook_get_group (source_notebook));
 
   gtk_container_add (GTK_CONTAINER (window), notebook);